ubuntu changes
resolved merge conflicts