k
solved some small conflicts