Cleaned up files after merge conflict