add other new stuff (resolve conflicts)