Merged with working tree