fixing conflict that was in settings template