dev changes
tmp file
conflict resolved
sample