commit changes made in feature-1
pull in shared dir and resolve conflicts