merge, fixes