Fixed merge conflicts
Removed fake gitlab config