Reset to commit 1c847d8cd732089f92d79c703fbc7b6c87fa9133
Merge remote-tracking branch 'origin/master'