Fixed merge. Fixed templates. Reverted poms