Removed leftovers from merge conflict
Resolved conflicts