Removed import
Resolved merge