Removing conflict lines

Just removing some conflict messages...