merge groupeE/master on master + resolve conflicts