custom fields
fixes with merge
user picture
resolved confilct