fixing conflits in eclipse