trying to commit some stuff after merge errors