removed %%
resolve conflicts