# Conflicts: # Liner_Advanced/src/projectliner/DrawingLiner.java # Liner_Advanced/src/projectliner/FormLiner.java