Fix post-merge stuffs