Install the dryrub app and use its assets instead of a local copy.
Resolve merge conflict.
Finish merge (again)