merge forcing me..
implemented if