st:merge conflict in post controller