fixed default behavior of merge
indenting
added derived file