Hidden fields readjust coordinates
Fix merge conflicts