merge changes from rest of team