Reverted merge mess