unit movement added
merger confilct