resolve merge conflict

2 jobs for improveStairs in 73 minutes and 20 seconds (queued for 2 seconds)