Fixed conflict issue

Conflict with Git caused extra lines to be added into these files.