compilation conflict fixed