POST: Fix merge problem