Cleaned conflict markers #2

Cleaned conflict markers #2