getting android conflicts resolved