Fix merge project