Fixed merge conflict
Fixed more bad merge (?) issues