Push after merge conflict. Added signup email php + swiftmailer