REALLY fixed merge conflicts