minor changes??
stupid conflict solved