Removed another merge conflict leftover