hopefully solves conflicts