Fixes post merge