trial commit before merge
resolved merge conflicts
final revision