First chec in clone
resolved pull conflicts