Fixing up post merge