resolved merge conflicts
syncing with github