merge master, resolve conflicts