added alignment, merge and readme