resolved conflict after James
empty lines conflict