Resolved reviousely left conflict from the file