Cleaned up after merge
Removed merge conflict