retreat to pre asset_sync gem
merging conflicts
merging diffs