Hopefully the final fix to all those merges