Post merge damage fixed