"trying to pool changes"
"finishing merge with resolved conflicts"
Merge commit '35670ef849c0334b46b5b1eea06c109222207f3b'
"omg got another conflict"
yet another commit because of conflict
Merge branch 'master' of https://github.com/thorsteinnth/raudirhestar_spilavefur