merged changes
resolved confilicts