Committing before merge
Fixed merge conflicts