deleted lines commented out
resolved conflicts.