post-merge adjustements