using compile
resolved conflicts
added ignore