fixed ignore
fixing merge issues