Set git-push rules to simple
Merge branch 'master' into laptop