consolidating calls
converging files
resolved merge conflict