fixing post merge