Added instructions for merging trunk