Resolved conflicts and code to fragments animations