Fixed action application bug
Resolved merge conflict
Fixed conflict