Resolved merge in MainActivity