fixing conflict & vanished files