Tryin resolve merging conflicts