made a conflict for 2c
resolved changes in shared copy
resolved all changes in shared 2c